bitkeeper revision 1.1159 (41137149kQ0eVoHQjKc8FK_iYKQPyQ)

A better build fix for 2.4.

diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile b/linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile
index 5f5e2efe6d95a875c1b698b22ff93aac15487d40..000e40934f7e2e0d972e01f3eb0092d076d2e839 100644 (file)
--- a/linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile
+++ b/linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile
@@ -6,7 +6,7 @@ all: kernel.o head.o init_task.o
 
 O_TARGET := kernel.o
 
-export-objs     := i386_ksyms.o evtchn.o
+export-objs     := i386_ksyms.o
 
 obj-y  := process.o semaphore.o signal.o entry.o traps.o irq.o  \
                ptrace.o ioport.o ldt.o setup.o time.o sys_i386.o \

diff --git a/linux-2.6.7-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6.7-xen-sparse/arch/xen/kernel/evtchn.c
index 07791b40c3d93ce80577a1320f0ce6e1eeb7d7d6..572732efda0fec501256befcc1eead3f73cf9924 100644 (file)
--- a/linux-2.6.7-xen-sparse/arch/xen/kernel/evtchn.c
+++ b/linux-2.6.7-xen-sparse/arch/xen/kernel/evtchn.c
@@ -12,6 +12,7 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/kernel_stat.h>
+#include <linux/version.h>
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/ptrace.h>
@@ -82,7 +83,9 @@ void evtchn_do_upcall(struct pt_regs *regs)
 
     local_irq_restore(flags);
 }
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 EXPORT_SYMBOL(evtchn_do_upcall);
+#endif
 
 static int find_unbound_irq(void)
 {